drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,390 Commits 1 Branch 0 Tags
Commit Graph

90390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kmccormick@google.com
0e2c9ee7df am a711d1ee: am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit 'a711d1ee76cf2e731d28a011c81d7f772cefa6c2':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-20 08:40:30 -08:00
Svetoslav Ganov
0ee790408e am 15861683: am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 
* commit '1586168302f79d10e85a5aeed7b486c4244cc98e':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
 2012-11-20 08:40:26 -08:00
Daniel Sandler
924c0690f4 am 272247aa: am aaec7269: (-s ours) Notification vibration improvements: [DO NOT MERGE] 
* commit '272247aa1f540f7c9b7fafa35bb59e507131d3f5':
  Notification vibration improvements: [DO NOT MERGE]
 2012-11-20 08:40:23 -08:00
kmccormick@google.com
a711d1ee76 am 55340e51: am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '55340e51343a248260f89e953476b1c6e731842a':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-20 08:38:19 -08:00
Svetoslav Ganov
1586168302 am e9812bae: Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 
* commit 'e9812bae0e0ce08bd232dc2371fdb959e4f7a318':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
 2012-11-20 08:38:16 -08:00
Daniel Sandler
272247aa1f am aaec7269: (-s ours) Notification vibration improvements: [DO NOT MERGE] 
* commit 'aaec726948078dad0bcc5cbbb41bb2ee6a5a085b':
  Notification vibration improvements: [DO NOT MERGE]
 2012-11-20 08:38:11 -08:00
kmccormick@google.com
55340e5134 am 7112cd46: am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '7112cd4687687203b35013f197089cb66508a14e':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:58:10 -08:00
kmccormick@google.com
7112cd4687 am 2f9947e9: am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit '2f9947e9aa2b795dbc7db282a99a09410f1fadf2':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:54:48 -08:00
kmccormick@google.com
2f9947e9aa am ddf10d44: Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 
* commit 'ddf10d44c12fbd8ffb115c847913296b455f412d':
  Doc Update: Removed "no guaranteed delivery" line.
 2012-11-19 16:53:11 -08:00
&& repo sync -j8
ddf10d44c1 Merge "Doc Update: Removed "no guaranteed delivery" line." into jb-dev-docs 2012-11-19 16:51:09 -08:00
Svetoslav Ganov
e9812bae0e Merge "Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)" into jb-mr1-dev 2012-11-19 15:50:19 -08:00
Svetoslav Ganov
7018cfdc05 Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back) 
This reverted change was adjusting the min and max values for the NumberPicker
which is not desirable since it changes behavior and it will be possible for
an app that works on the current platform to crash on an older one. Also the
adjustment was not implemented correctly.

Updated the documentation to clarify the reltionship between the min value,
max value, and the displayed values array.

Bug:7518172

This reverts commit a1410e6789ce72bc423793315a51aea8b6bad6c7

Change-Id: I109f1b1f54c1e609941243cabab9241871b6b12b
 2012-11-19 15:20:27 -08:00
Daniel Sandler
aaec726948 Notification vibration improvements: [DO NOT MERGE] 
- When notifications vibrate as a fallback (that is,
   because they want to play a sound but the device is in
   vibrate mode), this no longer requires the VIBRATE
   permission.
 - As a bonus, if your notifications use DEFAULT_VIBRATE,
   you don't need the VIBRATE permission either.
 - If you specify a custom vibration pattern, you'll still
   need the VIBRATE permission for that.
 - Notifications vibrating in fallback mode use same
   vibration pattern but can be changed easily in future.
 - The DEFAULT_VIBRATE and fallback vibrate patterns are now
   specified in config.xml.

Bug: 7531442
Change-Id: I7a2d8413d1becc53b9d31f0d1abbc2acc3f650c6
 2012-11-19 15:12:24 -08:00
Fabrice Di Meglio
d689e8c3a0 am b0f895b3: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 
* commit 'b0f895b330d0d2b6725e7deee158ff20ed9155f8':
  Fix Javadoc for View layoutDirection / textDirection / textAlignment
 2012-11-19 14:31:02 -08:00
Fabrice Di Meglio
b0f895b330 Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment" into jb-mr1.1-dev 2012-11-19 14:27:45 -08:00
Daniel Sandler
2d8d68566c am 02053d1c: Merge "Show mobile data RSSI for devices that support it." into jb-mr1.1-dev 
* commit '02053d1cce52f11ef1bc3b562279940208f9c54e':
  Show mobile data RSSI for devices that support it.
 2012-11-19 11:59:48 -08:00
Daniel Sandler
02053d1cce Merge "Show mobile data RSSI for devices that support it." into jb-mr1.1-dev 2012-11-19 11:56:35 -08:00
Scott Main
68395a6148 am 0d3eb5f1: am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 
* commit '0d3eb5f111571f40c1c25dab229a6b8a98e61eeb':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
 2012-11-19 11:50:58 -08:00
Scott Main
0d3eb5f111 am 721b370c: Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 
* commit '721b370c5a2d787795257ac42317d389445e51f9':
  cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo
 2012-11-19 11:48:28 -08:00
Scott Main
721b370c5a Merge "cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 Fix typo" into jb-mr1-dev 2012-11-19 11:44:58 -08:00
Jaewan Kim
ff5941399e cherrypick from Change-Id: I70cb9111ff5f5a156cecb433b3baf7925a6be1a8 
Fix typo

Change-Id: Idd09f7fea890dbc290589b1ebe4a1a139f98c740
 2012-11-19 11:43:56 -08:00
Daniel Sandler
5052805cc0 Show mobile data RSSI for devices that support it. 
The new test is more general, allowing mobile RSSI to be
shown on devices without voice telephony.

Bug: 7490266
Change-Id: Ib5b243c0d92e74fe4385989c3a6c16edd00a9ec9
 2012-11-19 13:33:44 -05:00
Satoshi Kataoka
0e1c092ab0 am 2656abe0: Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev 
* commit '2656abe09895088eca25caafc3e92869217d1447':
  Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected
 2012-11-17 21:56:09 -08:00
Satoshi Kataoka
2656abe098 Merge "Fix an inconsistent state with IMMS and Settings when the hard keyboard is connected" into jb-mr1.1-dev 2012-11-17 21:53:10 -08:00
Baligh Uddin
0c78d9eff8 am e007c0e8: am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'e007c0e8bc306f13149e6e099753cd110da1ec8c':
  Import translations. DO NOT MERGE
 2012-11-16 17:53:35 -08:00
Baligh Uddin
e007c0e8bc am bd7ff05e: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'bd7ff05e65113cd6fa5b7e0df9c7023e8cd60ac0':
  Import translations. DO NOT MERGE
 2012-11-16 17:50:13 -08:00
Baligh Uddin
8b65825336 am 50a89116: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '50a8911628a27fbbac678dd679aaafadceb65bee':
  Import translations. DO NOT MERGE
 2012-11-16 17:48:52 -08:00
Baligh Uddin
50a8911628 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-16 17:45:34 -08:00
Baligh Uddin
bd7ff05e65 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-11-16 17:43:56 -08:00
Baligh Uddin
8b024af2a4 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-16 17:42:20 -08:00
Baligh Uddin
b184a16815 am 7e5fc453: am 9d45abd4: Import translations. DO NOT MERGE 
* commit '7e5fc45320992d1f7063c1936662d48fde2e00f8':
  Import translations. DO NOT MERGE
 2012-11-16 17:40:57 -08:00
Baligh Uddin
75d66ffe82 am 3a3a84e4: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '3a3a84e4d6e507102ab52df9562191bbb98f4a88':
  Import translations. DO NOT MERGE
 2012-11-16 17:40:54 -08:00
Baligh Uddin
7e5fc45320 am 9d45abd4: Import translations. DO NOT MERGE 
* commit '9d45abd4aa761af65e27eb2300b50f35526a4b61':
  Import translations. DO NOT MERGE
 2012-11-16 17:39:20 -08:00
Baligh Uddin
3a3a84e4d6 Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-16 17:38:07 -08:00
Baligh Uddin
17936f0187 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-16 17:35:08 -08:00
Fabrice Di Meglio
13fbac6631 am 1f33e642: Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev 
* commit '1f33e6422ea80d6caba44dd05403b137c219938a':
  Fix keyguard pin/simpin/simpuk RTL-ization
 2012-11-16 16:38:55 -08:00
Fabrice Di Meglio
1f33e6422e Merge "Fix keyguard pin/simpin/simpuk RTL-ization" into jb-mr1.1-dev 2012-11-16 16:36:00 -08:00
Michael Jurka
cf474b1a10 am 7b0c8779: Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 
* commit '7b0c877959ee15c766cc7366ec6b4c024c211cd6':
  Delete appWidgetId when removing lockscreen widgets
 2012-11-16 15:31:07 -08:00
Michael Jurka
7b0c877959 Merge "Delete appWidgetId when removing lockscreen widgets" into jb-mr1.1-dev 2012-11-16 15:29:17 -08:00
Michael Jurka
75b5cfb4a4 Delete appWidgetId when removing lockscreen widgets 
Bug: 7550012

Change-Id: Ia9f5266256016eb91bfd6a2d5a7f910c42948f1e
 2012-11-16 15:22:06 -08:00
Jim Miller
05163aa3d5 Fix keyguard pin/simpin/simpuk RTL-ization 
This fixes the PIN, SIM PIN, and SIM PUK keyboards to keep the keys in the same
position for all languages.

Fixes bug 7538528

Change-Id: Ib07e89e9496e6c5b91c1bbda7781eddeddea0554
 2012-11-16 14:56:57 -08:00
Baligh Uddin
f3cd8e5e38 Import translations. DO NOT MERGE 
Change-Id: I8fdaf22a9c0ab1552d379501f7fde119064d49b8
Auto-generated-cl: translation import
 2012-11-16 14:11:16 -08:00
Baligh Uddin
af673f894b Import translations. DO NOT MERGE 
Change-Id: I8b0789aa1a67fba819a5f2b87373e9ab5fa3f59d
Auto-generated-cl: translation import
 2012-11-16 14:10:37 -08:00
Baligh Uddin
d98dcb457a Import translations. DO NOT MERGE 
Change-Id: Ia5d5f55b872c065f39ad7e86c62e049e547a74c8
Auto-generated-cl: translation import
 2012-11-16 14:09:54 -08:00
Guang Zhu
dbcdb1a854 am a9c0bb4a: Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 
* commit 'a9c0bb4a579a98cb7694e36454425c84a8c6510e':
  grant shell user EXPAND_STATUS_BAR permission
 2012-11-16 14:09:47 -08:00
Guang Zhu
a9c0bb4a57 Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev 2012-11-16 14:06:01 -08:00
Baligh Uddin
116133a2a6 Import translations. DO NOT MERGE 
Change-Id: I8187a141a3949c9c1678912b13267b21398a6c5e
Auto-generated-cl: translation import
 2012-11-16 13:51:42 -08:00
Baligh Uddin
9d45abd4aa Import translations. DO NOT MERGE 
Change-Id: I90b5f538f6faf18d571907acaa96372894619c87
Auto-generated-cl: translation import
 2012-11-16 13:49:29 -08:00
Baligh Uddin
1d1b7f05df Import translations. DO NOT MERGE 
Change-Id: Ia94359fa60af4992757b0d03a434cb7ab413f8cd
Auto-generated-cl: translation import
 2012-11-16 13:47:23 -08:00
Amith Yamasani
4ad8a4bd89 am acddb72c: Merge "Make sure that the owner user is marked initialized." into jb-mr1.1-dev 
* commit 'acddb72c58dbab029d1acbaea61755e79ef8b2a4':
  Make sure that the owner user is marked initialized.
 2012-11-16 10:47:11 -08:00