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

249817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Lu
0da397ea71 Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev 
am: d579d713a5

Change-Id: Iaea16a4bd5271a9ef50e0e27556f491a0ac0d314
 2016-07-25 18:59:59 +00:00
Mark Lu
325ce1a475 docs: updates to Buildilng Your First App doc 
am: 08d1bff71f

Change-Id: I030bd03c3f83ecc8332165dea75785cc78c3a114
 2016-07-25 18:59:56 +00:00
Andrii Kulian
7318d63ba6 Correctly finish activity in non-focused stack 
When activity is finished we first looked for next activity to
show in focused stack. If real next activity to show in place
of finishing one is in the same non-focused stack, we didn't
fully complete the dismissal process and activity was stuck in
FINISHING state.
This CL checks if we're trying to finish visible activity in
paused state and destroy it immediately if top running activity
is visible - same as we do for pinned activities.

Bug: 29458854
Change-Id: I0d5ceb2daa45c0628d89417c8456e132996bcea9
 2016-07-25 11:57:02 -07:00
Selim Cinek
52a11f7c64 Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev 
* changes:
  Fixes a bug where the lockscreen would be frozen
  Allow home button to be tapped while a incoming call shows a HUN
 2016-07-25 18:49:49 +00:00
TreeHugger Robot
d579d713a5 Merge "docs: updates to Buildilng Your First App doc" into nyc-dev 2016-07-25 18:45:51 +00:00
Jason Monk
5c6f5afd19 Merge "QS: Cleanup detail toggle on" into nyc-mr1-dev 2016-07-25 18:38:38 +00:00
Jason Monk
425023fcda Merge "QS: Fixup footer + animations" into nyc-mr1-dev 2016-07-25 18:36:02 +00:00
TreeHugger Robot
961492cc30 Merge "Don't reset layout params when repositioning" into nyc-mr1-dev 2016-07-25 18:34:34 +00:00
Raph Levien
83549088c6 Enforce consistent sizes for arrays in SpannableStringInternal 
The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.

This patch documents the invariant in a comment and enforces it.

Bug: 30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
 2016-07-25 18:19:00 +00:00
Mark Lu
08d1bff71f docs: updates to Buildilng Your First App doc 
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy

Bug: 29766869
Bug: 29768686
Bug: 19154557

Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
 2016-07-25 10:15:04 -07:00
Elliot Waite
dd756c26e2 Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev 
am: fc0bc7bf96

Change-Id: Id9bf642ea3d5105efbfa4663ced5c6f660e0fd7f
 2016-07-25 17:14:58 +00:00
Elliot Waite
c88afb6e3e Fix code tags that contain html encoded characters, and fix at links. 
am: c4ae7827e2

Change-Id: I9d5adc8d151a6d6ed1b8f81630bbf8a93329f181
 2016-07-25 17:14:56 +00:00
Garfield, Tan
ebb8450cd0 DO NOT MERGE: Change the order of 2 statements to remove race. 
When we finish action mode we access to the cursor of model in main
thread to remove selection. When we transfer documents we have a
GetDocumentsTask that access the cursor in background. This creates a
race condition that contaminates the final copy result.

Temporary solution is to finish action mode first and then transfer
documents so that when GetDocumentsTask is running action mode is
already finished.

Permanent solution is provided as part of ag/1138398 which removes
GetDocumentsTask.

Bug: 30082168
Change-Id: I5bffe2093a58c856044026913d038f80a3fd7d55
 2016-07-25 10:12:22 -07:00
Dirk Dougherty
fc0bc7bf96 Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev 2016-07-25 17:00:19 +00:00
TreeHugger Robot
a2d4d0b599 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-25 16:51:07 +00:00
TreeHugger Robot
f968d50316 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-25 16:50:43 +00:00
TreeHugger Robot
bc3ae84aeb Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-25 16:50:25 +00:00
TreeHugger Robot
0f840998b1 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-07-25 16:46:28 +00:00
Agnieszka Madurska
8ec317e220 Merge "Add support for round scroll bars to View.java" into nyc-mr1-dev 2016-07-25 16:31:36 +00:00
Kevin Hufnagle
29d74d6490 Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\" into nyc-dev 
am: 30588da701

Change-Id: I252f462a12d2381ac01a966f5787bff9e2a60cd5
 2016-07-25 15:53:57 +00:00
Kevin Hufnagle
f16f31b643 Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a 
am: 616ba9d22b

Change-Id: I5656f3aaba73ccdc6ac5b98158bc5ff1220b67e5
 2016-07-25 15:53:43 +00:00
Kevin Hufnagle
00f04508da Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev 
am: aa57295104

Change-Id: I87db649cfa3c4ea702cb0b0ae40d65aec2cc5619
 2016-07-25 15:53:24 +00:00
Kevin Hufnagle
83cd591aa2 docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480 
am: 15865b5c67

Change-Id: I036e11173b14975721c542973cb794aaf3f1b44a
 2016-07-25 15:53:17 +00:00
Kevin Hufnagle
92cdc875ca Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c 
am: 29df77dd86

Change-Id: Ic45e915b80fd0ca6ab30868fc8b3e103f106f4c9
 2016-07-25 15:53:10 +00:00
Kevin Hufnagle
c0c9e529db docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87 
am: b65288fcb5

Change-Id: Ia2e1fd9035cd9eeda2173871eab80da73c89c613
 2016-07-25 15:53:07 +00:00
Android Build Merger (Role)
30588da701 Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a" into nyc-dev 2016-07-25 15:46:56 +00:00
Android Build Merger (Role)
aa57295104 Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480" into nyc-dev 2016-07-25 15:46:34 +00:00
Kevin Hufnagle
616ba9d22b Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a 
am: 260e77f68a

Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb
 2016-07-25 15:45:56 +00:00
Kevin Hufnagle
15865b5c67 docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 
am: e059c15480

Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9
 2016-07-25 15:45:51 +00:00
Kevin Hufnagle
29df77dd86 Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a 
am: c59557649c

Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d
 2016-07-25 15:45:47 +00:00
Kevin Hufnagle
b65288fcb5 docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 
am: 22be9b1a87

Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d
 2016-07-25 15:45:45 +00:00
Kevin Hufnagle
c59557649c Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs 
am: c46ee88f9a

Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881
 2016-07-25 15:39:27 +00:00
Kevin Hufnagle
22be9b1a87 docs: Fixed option for \"launchMode\" within Android manifest doc. 
am: 7ce51cf350

Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355
 2016-07-25 15:39:22 +00:00
Kevin Hufnagle
260e77f68a Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs 
am: c46ee88f9a

Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a
 2016-07-25 15:39:20 +00:00
Kevin Hufnagle
e059c15480 docs: Fixed option for \"launchMode\" within Android manifest doc. 
am: 7ce51cf350

Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4
 2016-07-25 15:39:18 +00:00
Kevin Hufnagle
c46ee88f9a Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs 2016-07-25 15:33:03 +00:00
Jason Monk
df36aed859 QS: Fixup footer + animations 
- Fix footer alpha animation
 - Don't show page area when not needed

Change-Id: I1429be25d4768177d691cc50ce4900f6e320938d
Fixes: 30355437
 2016-07-25 11:21:56 -04:00
Aga Madurska
b19d0f9800 Add support for round scroll bars to View.java 
Change-Id: If94a29d68cee504f7d31519b96f7b4b8a3af6bfa
 2016-07-25 16:14:55 +01:00
Bill Yi
148b5baa6d Import translations. DO NOT MERGE 
Change-Id: I78d008a1f0fc9e4e2402fb0768223baa97d2ef48
Auto-generated-cl: translation import
 2016-07-25 07:24:09 -07:00
Jason Monk
35a9c14cc6 QS: Cleanup detail toggle on 
- Fix animating state to not animate when already on
 - Fix enabled state to not be disable during initial animation

Change-Id: Id9c2d160bb65ee9c859f67a6d310f9b84d1b8944
Fixes: 30292340
 2016-07-25 10:18:30 -04:00
Jorim Jaggi
90dfb89916 Don't reset layout params when repositioning 
Not needed and leads to important properties being lost.

Change-Id: If2cf63df1ef6fe1357c10eedc8acfcf951fc2fa9
Fixes: 30355267
 2016-07-25 15:57:36 +02:00
Bill Yi
9d1117531d Import translations. DO NOT MERGE 
Change-Id: I27c1e473ca98bdc216d7bdf8d8d2f1838fa1c728
Auto-generated-cl: translation import
 2016-07-25 04:23:39 -07:00
Bill Yi
da6099ec45 Import translations. DO NOT MERGE 
Change-Id: I21868a3ae2dabfa27bdd770a55d4d137bdf1811f
Auto-generated-cl: translation import
 2016-07-25 04:20:49 -07:00
Bill Yi
48ca6ecfdd Import translations. DO NOT MERGE 
Change-Id: Iebb18322c5c0dbef9885ddc1db6ae12facbc01ec
Auto-generated-cl: translation import
 2016-07-25 04:18:00 -07:00
Tony Mak
0df1d34e6e Merge "Persist master volume mute across reboot" into nyc-mr1-dev 2016-07-25 10:31:01 +00:00
Hugo Benichi
514da60fb6 Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission 
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.

Bug: 24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
 2016-07-25 10:24:42 +09:00
Jaewan Kim
715e07a356 Merge "PIP: Handle layoutDirection changes" into nyc-mr1-dev 2016-07-25 00:53:53 +00:00
Dan Sandler
7c2e730f63 Fix crash for some seed values. 
Change-Id: I2f8d0a388a1bfdd4d3111abce7e4bcafe1e9bf3d
Fixes: 30169383
 2016-07-24 21:22:40 +00:00
Dan Sandler
1e52909888 Use a compressed Icon for the notification's largeIcon. 
Fixes: 29918548
Change-Id: I2f70011221c7ec96aab8e540cd0213660282b49c
 2016-07-24 21:22:23 +00:00
Dan Sandler
4a1bcd966b Grooming the cats. 
- Closed up tiny gaps in the vectors
 - Export larger cat PNGs
 - Make it harder to delete cats by accident
 - Properly color the two front/back feet most of the time
   instead of the two left/right

Change-Id: I185bf433d3be004945d6e16387ec928c14376b7a
Fixes: 29922607
Fixes: 30064123
Fixes: 29922111
Fixes: 29922066
 2016-07-24 21:19:14 +00:00