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

90513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
70f1782298 am 54525d8e: Merge "Clean up the Builder test." into jb-mr1.1-dev 
* commit '54525d8e4b2bcffcf33b5df8292e9ec45b9aaa3d':
  Clean up the Builder test.
 2012-11-27 18:17:45 -08:00
Daniel Sandler
7908581bc0 am 5bff5517: Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev 
* commit '5bff551710d2f2b9d7c6ea814b18b042ee0fe663':
  Refresh the status bar clock format on user switch.
 2012-11-27 18:16:10 -08:00
Daniel Sandler
54525d8e4b Merge "Clean up the Builder test." into jb-mr1.1-dev 2012-11-27 18:13:29 -08:00
Daniel Sandler
5bff551710 Merge "Refresh the status bar clock format on user switch." into jb-mr1.1-dev 2012-11-27 18:12:47 -08:00
kmccormick@google.com
b217b825a0 am 1f301634: am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit '1f301634d3a9765decad91327d732064f11aae77':
  Doc update: new Notify User AU class
 2012-11-27 17:00:27 -08:00
kmccormick@google.com
1f301634d3 am 58d55b04: am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit '58d55b0456a72daaf31c4e02227e82a8707ecf73':
  Doc update: new Notify User AU class
 2012-11-27 16:57:51 -08:00
kmccormick@google.com
58d55b0456 am d60ea46f: am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'd60ea46fe7a9856ca592ff7dea79aa8ce80f5e66':
  Doc update: new Notify User AU class
 2012-11-27 16:56:03 -08:00
kmccormick@google.com
d60ea46fe7 am a880436f: am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'a880436f4416168d256822a23bd23f936136706d':
  Doc update: new Notify User AU class
 2012-11-27 16:54:01 -08:00
kmccormick@google.com
a880436f44 am b7863a3c: Merge "Doc update: new Notify User AU class" into jb-dev-docs 
* commit 'b7863a3ce4db964322783ff7e84acc5713e04d1d':
  Doc update: new Notify User AU class
 2012-11-27 16:52:00 -08:00
&& repo sync -j8
b7863a3ce4 Merge "Doc update: new Notify User AU class" into jb-dev-docs 2012-11-27 16:49:37 -08:00
&& repo sync -j8
0aae00051c Doc update: new Notify User AU class 
Change-Id: Idcda9535c5aa2602cf4f0aecb3ab4b1518ab966b
 2012-11-27 16:37:36 -08:00
Robert Ly
e03a213e12 am e3a94e9d: am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit 'e3a94e9dd21c002b003ec1a946e2ec6df25c9e0d':
  docs: add new GMS landing and reference
 2012-11-27 16:36:35 -08:00
Robert Ly
e3a94e9dd2 am d29457e4: Merge "docs: add new GMS landing and reference" into jb-mr1-dev 
* commit 'd29457e40379d6df0cbf8bbbe5945f0827a0d19c':
  docs: add new GMS landing and reference
 2012-11-27 16:35:19 -08:00
Robert Ly
d29457e403 Merge "docs: add new GMS landing and reference" into jb-mr1-dev 2012-11-27 16:32:05 -08:00
Craig Mautner
067a7ac494 am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 
* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
  Retain configuration change info and sync access.
 2012-11-27 16:20:34 -08:00
Craig Mautner
9e98927e2d Merge "Retain configuration change info and sync access." into jb-mr1.1-dev 2012-11-27 16:17:45 -08:00
Dirk Dougherty
3cc883459a am b544af37: am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev 
* commit 'b544af3796b43afa9ae6f2196df569de175e0d24':
  Doc change: fix typo in jb docs.
 2012-11-27 16:10:07 -08:00
Robert Ly
6519ca0c5f docs: add new GMS landing and reference 
Change-Id: I48c75dd5924bdf297b5368887084d148efcd66ba
 2012-11-27 16:09:58 -08:00
Dirk Dougherty
b544af3796 am 5f8c2dfe: Merge "Doc change: fix typo in jb docs." into jb-mr1-dev 
* commit '5f8c2dfebe23d4a0a212138b2243059c24940d21':
  Doc change: fix typo in jb docs.
 2012-11-27 16:08:00 -08:00
Dirk Dougherty
5f8c2dfebe Merge "Doc change: fix typo in jb docs." into jb-mr1-dev 2012-11-27 16:06:10 -08:00
Dirk Dougherty
1d95cb6731 Doc change: fix typo in jb docs. 
Change-Id: I1e9820685eb8f1aa5580643215f5a7edd0c99c07
Bug:  7621378
 2012-11-27 16:03:21 -08:00
Amith Yamasani
1c2c48cba6 am f426ace9: Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 
* commit 'f426ace9dab65c88b36a047bf921070edcf8cf61':
  Only wipe device if primary user (for failed password attempts)
 2012-11-27 15:40:36 -08:00
Amith Yamasani
f426ace9da Merge "Only wipe device if primary user (for failed password attempts)" into jb-mr1.1-dev 2012-11-27 15:37:40 -08:00
Michael Jurka
712c26865c am 09a526fa: Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev 
* commit '09a526faf311f77017f37af3fe8aba45bc2c32fb':
  Fix bug: swiped apps in Recents come back on rotate
 2012-11-27 14:51:45 -08:00
Michael Jurka
09a526faf3 Merge "Fix bug: swiped apps in Recents come back on rotate" into jb-mr1.1-dev 2012-11-27 14:49:41 -08:00
Baligh Uddin
9e2783ee9f am 4df6c629: Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 
* commit '4df6c6292b9bfa35ece3c09d5094a7f4089c5029':
  Import translations. DO NOT MERGE
 2012-11-27 13:27:27 -08:00
Baligh Uddin
346b6a4221 am 18a4aa89: am c8d2abd8: Import translations. DO NOT MERGE 
* commit '18a4aa8996891648bc0c9d7a5bed3b3bf28acdec':
  Import translations. DO NOT MERGE
 2012-11-27 13:25:49 -08:00
Baligh Uddin
4df6c6292b Merge "Import translations. DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 13:21:26 -08:00
Baligh Uddin
18a4aa8996 am c8d2abd8: Import translations. DO NOT MERGE 
* commit 'c8d2abd81d85b7049837f0dc42310eee64c08d16':
  Import translations. DO NOT MERGE
 2012-11-27 13:20:55 -08:00
Baligh Uddin
12e9bfd677 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-27 13:15:57 -08:00
Chet Haase
3b2b3aaf9f am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 
* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
  Fix infinite recursive loop DO NOT MERGE
 2012-11-27 12:49:16 -08:00
Craig Mautner
e855214249 Retain configuration change info and sync access. 
- If a window was hidden while the configuration changed and then
changed back WindowManagerService would not know that the change
had ever happened and wouldn't notify the window of this. Most
windows wouldn't care but because Keyguard inflates layouts while
it is hidden...

Bug 7094175 fixed?
Bug 7501099 fixed!

Change-Id: If27f5f1d333602dac7719dd39dbdf3fe7954aa06
 2012-11-27 12:47:27 -08:00
Chet Haase
47a8e863e3 Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev 2012-11-27 12:47:19 -08:00
Baligh Uddin
d27c81fecc Import translations. DO NOT MERGE 
Change-Id: Iadbc15f54f259bea612b1ec99c1dfd64e1a51674
Auto-generated-cl: translation import
 2012-11-27 12:46:53 -08:00
Baligh Uddin
c8d2abd81d Import translations. DO NOT MERGE 
Change-Id: I1079e1b66c125f8b6044f3502961e11cc7858ba3
Auto-generated-cl: translation import
 2012-11-27 12:45:19 -08:00
Baligh Uddin
86b758f4f3 Import translations. DO NOT MERGE 
Change-Id: Iceeb36fd0bb841e6bca65966a425a2de9d3c4121
Auto-generated-cl: translation import
 2012-11-27 12:43:47 -08:00
Dianne Hackborn
78551bc7d5 am ba4ac518: Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 
* commit 'ba4ac51823c59152e2167365b81ac56857b6b4d0':
  Improve debugging for issue #7586414: AlarmManager wakelocks held
 2012-11-27 11:31:53 -08:00
The Android Open Source Project
3407c24dd9 am 6f3b20cc: Reconcile with jb-mr1-release - do not merge 
* commit '6f3b20ccc14c25173780f01c621dbb2279cd8236':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
  Notification vibration improvements: [DO NOT MERGE]
 2012-11-27 11:31:40 -08:00
Satoshi Kataoka
1c37b80009 am 1af08411: Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 
* commit '1af084113713743c70df04702083fff5a5325482':
  Hide current soft input when a background user gains window focus.
 2012-11-27 11:31:26 -08:00
Svetoslav Ganov
37eaac1da4 am de0bf8bc: am abb4a700: Update the content shell command\'s usage instructions. 
* commit 'de0bf8bc2c9814e255b45abf0453260fff5ebffa':
  Update the content shell command's usage instructions.
 2012-11-27 11:31:21 -08:00
Amith Yamasani
eb933360ee am 7be52cbc: Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 
* commit '7be52cbc33157e4700b7d04e69d1149cd80e9096':
  Logging to help find the cause of widget crash in clock widget.
 2012-11-27 11:31:14 -08:00
Winson Chung
9f6e8ddf5d am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev 
* commit '2b847c39336024a958742195de4f406e7aa79540':
  Removing unecessary additional lock metadata from QuickSettings user tile.
 2012-11-27 11:31:03 -08:00
Michael Jurka
e020af835b am ab972a6d: Merge "Fix bug where icon animation is sometimes skipped" into jb-mr1.1-dev 
* commit 'ab972a6dce0d3d75fa9db2b5f9c0a88505e237fd':
  Fix bug where icon animation is sometimes skipped
 2012-11-27 11:30:58 -08:00
László Dávid
6ead9418ff Fix infinite recursive loop DO NOT MERGE 
FindBugs description:

There is an apparent recursive loop at IntProperty.java
in method set(Object, Integer)

This method unconditionally invokes itself. This would seem
to indicate an infinite recursive loop that will result in a stack overflow.

Note: Checked into AOSP. Cherry-picking for mr1.1.

Issue #7621806 IntProperty has infinite recursion bug

Change-Id: I2f52dd3689198cb948925aa65dd9c95be7888fe7
 2012-11-27 11:11:10 -08:00
Dianne Hackborn
ba4ac51823 Merge "Improve debugging for issue #7586414: AlarmManager wakelocks held" into jb-mr1.1-dev 2012-11-27 11:06:35 -08:00
Dianne Hackborn
8103890a59 Improve debugging for issue #7586414: AlarmManager wakelocks held 
In alarm manager, print a summary of the top 10 alarms by time
being executed.  Keep track of execution time (and wake count) of
each type of alarm for each application so this can be printed in
the summary (and used to compute the top 10 alarms).  Rework how
the alarm summary stats are tracked so that we don't need to hold
on to the full Intent for each stat and can get the Intent information
at the time the alarm is sent rather than waiting for whatever Intent
comes back in the result.

Also in the battery stats: sort the kernel wake locks by time, add
a new section showing all partial wake locks across all applications
sorted by time.

Finally a new LocalLog class that is used by AlarmManager to log
important warning messages, so these can also be later found in
its dumpsys output.

Change-Id: Icc07810053e60fb623a49937e696819cb8352b06
 2012-11-27 11:05:42 -08:00
The Android Open Source Project
6f3b20ccc1 Reconcile with jb-mr1-release - do not merge 
Change-Id: I60dc4bad2244ed88aec29926b08dcecf3a07462e
 2012-11-27 07:33:31 -08:00
Satoshi Kataoka
1af0841137 Merge "Hide current soft input when a background user gains window focus." into jb-mr1.1-dev 2012-11-26 19:39:20 -08:00
Svetoslav Ganov
de0bf8bc2c am abb4a700: Update the content shell command\'s usage instructions. 
* commit 'abb4a7008a1f5eab6cfaf7e9dd4779e549c21714':
  Update the content shell command's usage instructions.
 2012-11-26 17:22:40 -08:00
Amith Yamasani
7be52cbc33 Merge "Logging to help find the cause of widget crash in clock widget." into jb-mr1.1-dev 2012-11-26 16:22:41 -08:00