Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
158,980 Commits 3 Branches 0 Tags
a01e83b2665e32f0ee74ee97b37e12fe1c9ac986
Commit Graph

158980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smain@google.com
a01e83b266 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
automerge: 63ed5e1

* commit '63ed5e1b7736006f8d4ac5b4e60c453e2b26ad81':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-16 01:35:19 +00:00
Joe Fernandez
519fbf3ae7 am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
automerge: d799f75

* commit 'd799f75c6b3adb088372f73967aee6362407e59b':
  docs: uiautomator blog link removal
 2014-12-16 01:33:56 +00:00
Joe Fernandez
9a05dee5ec am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
automerge: 72268ad

* commit '72268ad3d4ecdeaee47ad8de0ec372bb834255c7':
  docs: studio basics typo
 2014-12-16 01:32:49 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:29:01 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Prem Kumar
9ef07ad2b6 Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 2014-12-14 19:53:48 +00:00
Prem Kumar
6c2fa049aa Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 2014-12-14 19:52:40 +00:00
Guang Zhu
07bba9abee Merge "shell based UI Automator source move" into lmp-mr1-dev 2014-12-14 03:30:57 +00:00
Jinsuk Kim
a2bc055eeb Merge "audioservice: Clear calling identity upon calling HdmiControlService" into lmp-mr1-dev 2014-12-13 23:41:48 +00:00
Guang Zhu
18b892c723 shell based UI Automator source move 
frameworks/testing/uiautomator -> frameworks/base/cmds/uiautomator
  (samples, utils sub folders exlcuded)
frameworks/testing/uiautomator/utils -> frameworks/base/tests/utils

no source files changed, only one line makefile update (for
UI Automator API check)

Bug: 18708851
Change-Id: I396bd386d3d55a52df18af183685daf80caa9f73
 2014-12-12 17:31:38 -08:00
smain@google.com
63ed5e1b77 am 8bb3962b: am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
* commit '8bb3962b2e58870efa01b2fc0fd8c2a620414974':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-13 01:12:37 +00:00
smain@google.com
8bb3962b2e am 8e8f29e3: Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 
* commit '8e8f29e34266b49d02f236367be98d6885f2f8a6':
  fix distribute nav styles. they were not highlighted correctly.
 2014-12-13 01:04:02 +00:00
smain@google.com
8e8f29e342 Merge "fix distribute nav styles. they were not highlighted correctly." into lmp-docs 2014-12-13 00:55:32 +00:00
Christopher Tate
90c0ae637a Merge "Check which file changed before requesting backup" into lmp-mr1-dev 2014-12-13 00:52:14 +00:00
Joe Fernandez
d799f75c6b am 4234fca6: am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
* commit '4234fca655819538fea60cafe2b8bf3e597fa3ea':
  docs: uiautomator blog link removal
 2014-12-13 00:34:20 +00:00
Joe Fernandez
4234fca655 am 044f3947: Merge "docs: uiautomator blog link removal" into lmp-docs 
* commit '044f3947bc2e5e1beb2e46dd8e32822b57132b4a':
  docs: uiautomator blog link removal
 2014-12-13 00:25:14 +00:00
Joe Fernandez
044f3947bc Merge "docs: uiautomator blog link removal" into lmp-docs 2014-12-13 00:20:35 +00:00
Joe Fernandez
72268ad3d4 am e70cb874: am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
* commit 'e70cb874d9a53c6afa78c752ababe8e2f44ba0c8':
  docs: studio basics typo
 2014-12-13 00:16:56 +00:00
Amith Yamasani
52d750c5c2 Check which file changed before requesting backup 
Make sure that the changed file is one of the wallpaper files
before requesting backup or informing listeners.

Bug: 18694053
Change-Id: Iaa8fe9d3c97634b3cc6a9ccd67c36cf394d17ca0
 2014-12-13 00:15:45 +00:00
Luan Nguyen
bb01880e62 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
* commit '47efca783cda4a9f13d172ddfc30443de1d94b91':
  docs: Add two new general functionality requirements
 2014-12-13 00:12:16 +00:00
Joe Fernandez
e70cb874d9 am c59d1d78: Merge "docs: studio basics typo" into lmp-docs 
* commit 'c59d1d780b03b96b3d92990d629de865dd2c585c':
  docs: studio basics typo
 2014-12-13 00:10:17 +00:00
Luan Nguyen
47efca783c am a854ddfd: docs: Add two new general functionality requirements 
* commit 'a854ddfd79c7d1458452b6238fbc5f69ba610002':
  docs: Add two new general functionality requirements
 2014-12-13 00:04:06 +00:00
Tim Murray
a6bfe6c957 Merge "Enable native tracking for RS contexts to improve GC behavior." into lmp-mr1-dev 2014-12-13 00:03:53 +00:00
Joe Fernandez
c59d1d780b Merge "docs: studio basics typo" into lmp-docs 2014-12-13 00:03:10 +00:00
Rich Slogar
7789f4dbee docs: studio basics typo 
Change-Id: I3e20deb2abc8513266cc2182d9be1ae809bbeae0
 2014-12-12 15:56:46 -08:00
Luan Nguyen
a854ddfd79 docs: Add two new general functionality requirements 
Bug: 18733124
Change-Id: Ia4b1e74980cbb645d1ab0b61ec56f06a3704fd3b
 2014-12-12 15:10:19 -08:00
Alan Viverette
0cecbc9c72 Avoid self-recursion if client calls init() from date listener 
BUG: 18736166
Change-Id: Ibe04040356f4a3e4479ea55c53a0e167144ff877
 2014-12-12 14:32:43 -08:00
Bart Sears
1f28a6a571 resolved conflicts for merge of 08c72334 to lmp-mr1-dev 
Used "-s ours" for the merge since this CL had been cherry-picked from
lmp-mr1-dev to lmp-dev so when auto-merging back, we want to keep what
is already in lmp-mr1-dev.
 2014-12-12 14:19:57 -08:00
Alan Viverette
cd305ae3ce Give accessibility delegate the first pass at handling ACTION_CLICK 
Delegation is broken for widgets, but this fixes the most egregious issue
where TextViews that are top-level list items weren't handling CLICK
actions correctly. This will still need work, since now the focus action
won't run, but it's an improvement.

BUG: 18736135
Change-Id: I808ef628198946cc87f13c53d6245cd162a1e517
 2014-12-12 14:13:24 -08:00
Alan Viverette
7c3212b2f4 Merge "Propagate DrawableContainer state on mutate, fix ColorDrawable theming" into lmp-mr1-dev 2014-12-12 22:00:26 +00:00
Alan Viverette
9a1b4c2967 Merge "Move ripple to end state on jump when hardware exit is pending" into lmp-mr1-dev 2014-12-12 21:59:22 +00:00
Alan Viverette
9bc11ac168 Move ripple to end state on jump when hardware exit is pending 
BUG: 18734676
Change-Id: Ie063e1eec0b4f28f936ea27822afacfd1b72a0e9
 2014-12-12 13:38:10 -08:00
Tim Murray
eae2472985 Enable native tracking for RS contexts to improve GC behavior. 
This should prevent apps from leaking RS contexts as easily.

bug 18579193

Change-Id: I2d943ce4443ce7cb90ebdd3dd37d338eda6df3a2
 2014-12-12 13:30:15 -08:00
Chong Zhang
bb177db1fe Merge "parse bitrate range for video/audio caps" into lmp-mr1-dev 2014-12-12 20:49:36 +00:00
Svet Ganov
14e3351a1e Merge "Fix a NPE in AccessiiblityManagerService." into lmp-mr1-dev 2014-12-12 20:49:01 +00:00
Svet Ganov
7486bc1f5a Merge "Fix an edge case in computing click location in accessibility mode." into lmp-mr1-dev 2014-12-12 20:48:09 +00:00
Alan Viverette
419aa7ad14 Propagate DrawableContainer state on mutate, fix ColorDrawable theming 
BUG: 18542282
BUG: 18467568
Change-Id: Id1d75cfe47fde3206ab40e5360289e0cb2504402
 2014-12-12 12:34:15 -08:00